Brad Jorsch [Wed, 11 May 2016 18:21:08 +0000 (14:21 -0400)]
Fix ApiBase::getErrorFromStatus() and ApiMessages
When the code was written, $status->getErrorsArray() would return the
Message objects unchanged. But I0deaa988 broke that and apparently
didn't bother fixing callers.
Now that I'm trying to actually use it for something, I find it's
broken, so I fixed it.
Change-Id: I763729c5bdd63448b50229774ef1f9d12cfb795d
jenkins-bot [Wed, 11 May 2016 14:03:34 +0000 (14:03 +0000)]
Merge "Add SessionManager::invalidateSessionsForUser"
jenkins-bot [Wed, 11 May 2016 11:42:41 +0000 (11:42 +0000)]
Merge "Add WebRequest methods for determining "safe" requests"
jenkins-bot [Wed, 11 May 2016 04:37:22 +0000 (04:37 +0000)]
Merge "Pass the OutputPage object to the OutputPageCheckLastModified hook"
Roan Kattouw [Wed, 11 May 2016 00:13:47 +0000 (17:13 -0700)]
Pass the OutputPage object to the OutputPageCheckLastModified hook
So that the hook function has a ContextSource.
Change-Id: I044a5920b703a2d61a74c2d83d184b77caebb8f3
jenkins-bot [Wed, 11 May 2016 00:59:53 +0000 (00:59 +0000)]
Merge "Add User::isBot() method"
Aaron Schulz [Sun, 8 May 2016 09:11:14 +0000 (02:11 -0700)]
Add User::isBot() method
Global group and other extensions can hook into the hook
to flag global bots and the like.
Change-Id: I1290932fccb62508d2a8b7f94f056badadf6fdfc
jenkins-bot [Wed, 11 May 2016 00:25:42 +0000 (00:25 +0000)]
Merge "Make GenderCache use MediaWikiServices"
James D. Forrester [Tue, 10 May 2016 23:06:27 +0000 (16:06 -0700)]
Update OOjs UI to v0.17.2
Release notes:
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.17.2
Change-Id: I8e8101e3284c69f8fa6edf142f4cf84efff65e09
jenkins-bot [Tue, 10 May 2016 22:29:43 +0000 (22:29 +0000)]
Merge "Update default hash storage settings"
Brad Jorsch [Tue, 10 May 2016 20:40:46 +0000 (16:40 -0400)]
Add SessionManager::invalidateSessionsForUser
Most of the time calling User::setToken() is enough, but CentralAuth
needs to be able to call CentralAuthUser::resetAuthToken() on command.
Change-Id: Iad2ae914a81481f040e047b550f3fd3437277626
jenkins-bot [Tue, 10 May 2016 20:09:02 +0000 (20:09 +0000)]
Merge "Convert Special:WhatLinksHere from XML form to OOUI form"
Translation updater bot [Tue, 10 May 2016 19:59:57 +0000 (19:59 +0000)]
Merge "Localisation updates from https://translatewiki.net."
Ajayrahul P [Sat, 12 Mar 2016 13:43:04 +0000 (19:13 +0530)]
Convert Special:WhatLinksHere from XML form to OOUI form
Bug: T117754
Change-Id: I902269c4dbf4147d291c98e61dbdad1d99bd3732
jenkins-bot [Tue, 10 May 2016 19:58:28 +0000 (19:58 +0000)]
Merge "Convert Special:MergeHistory to use OOUI."
Translation updater bot [Tue, 10 May 2016 19:57:33 +0000 (21:57 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Ic9f08416c57ebe67a3ebdac74c273f2b2a4abd4b
Sethakill [Sun, 8 May 2016 10:03:29 +0000 (12:03 +0200)]
Convert Special:MergeHistory to use OOUI.
Bug: T134675
Change-Id: I8234632daff04902f317b5d8c84207e30b845358
Aaron Schulz [Fri, 6 May 2016 22:25:36 +0000 (15:25 -0700)]
Add WebRequest methods for determining "safe" requests
* This is useful for logic that decides what DB (master/slave) to use
based on the nature of the web request. It could also be used to
enforce clear read/write distinctions via exceptions if DB_MASTER
is misused.
* Also fixed two IDEA errors while editing this class.
Bug: T134608
Change-Id: I43f4bc06c19d823d7d1ffd9cee8bbe60563c7f82
jenkins-bot [Tue, 10 May 2016 13:19:44 +0000 (13:19 +0000)]
Merge "Avoid master queries on GET in ProtectionForm"
jenkins-bot [Tue, 10 May 2016 13:06:14 +0000 (13:06 +0000)]
Merge "Remove DELETE_SOURCE flag from FileRepo store()/storeBatch()"
jenkins-bot [Tue, 10 May 2016 12:59:42 +0000 (12:59 +0000)]
Merge "Make recent changes update jobs use configurable $wgUpdateRowsPerQuery"
jenkins-bot [Tue, 10 May 2016 12:38:52 +0000 (12:38 +0000)]
Merge "Fix executeTiming statsd metrics"
jenkins-bot [Tue, 10 May 2016 12:38:38 +0000 (12:38 +0000)]
Merge "Add Czech aliases to most special pages"
jenkins-bot [Tue, 10 May 2016 12:33:23 +0000 (12:33 +0000)]
Merge "Avoid spamming the duplicate key fetch log in BagOStuff::merge()"
jenkins-bot [Tue, 10 May 2016 12:26:55 +0000 (12:26 +0000)]
Merge "Remove wfDebug() from Revision::loadText()"
jenkins-bot [Tue, 10 May 2016 12:26:51 +0000 (12:26 +0000)]
Merge "Remove wfDebug() from getInterwikiCacheEntry()"
matejsuchanek [Fri, 22 Apr 2016 07:08:15 +0000 (09:08 +0200)]
Add Czech aliases to most special pages
Change-Id: Ie3ea6eb24ca26fc59009bc52676d504a8252533a
Aaron Schulz [Tue, 10 May 2016 05:42:07 +0000 (22:42 -0700)]
Remove a wfDebug() from File::transform()
This is uses a fair amount of time according to flamegraphs.
Change-Id: Iff31fb942b9589f91ec7c0501a248e63bc643d8c
Aaron Schulz [Tue, 10 May 2016 05:40:31 +0000 (22:40 -0700)]
Remove wfDebug() from getInterwikiCacheEntry()
This is uses a fair amount of time according to flamegraphs.
Change-Id: I178a590ab5de2f6fb9366ad59434d8b27dad710d
Aaron Schulz [Tue, 10 May 2016 05:37:50 +0000 (22:37 -0700)]
Remove wfDebug() from Revision::loadText()
This is uses a fair amount of time according to flamegraphs.
Change-Id: I598f98dd0e2232ac9741585c14096e763dcab91e
Aaron Schulz [Tue, 10 May 2016 05:12:38 +0000 (22:12 -0700)]
Avoid master queries on GET in ProtectionForm
Bug: T92357
Change-Id: I58c5e793164faaafeea45ec5e986edcc7537ccab
jenkins-bot [Tue, 10 May 2016 04:13:13 +0000 (04:13 +0000)]
Merge "BlockLevelPass: minor changes due to initial code review"
jenkins-bot [Tue, 10 May 2016 04:10:11 +0000 (04:10 +0000)]
Merge "Split out doBlockLevels() into its own class"
jenkins-bot [Tue, 10 May 2016 00:15:58 +0000 (00:15 +0000)]
Merge "Include type in hashKeyIntoSlots()"
Aaron Schulz [Tue, 3 May 2016 10:53:06 +0000 (03:53 -0700)]
Include type in hashKeyIntoSlots()
Otherwise, all pool types that use slots will collide
due to the slotted keys not using a type prefix.
Bug: T134144
Change-Id: Ib367fedf2cfb7fecc290206e69e0d105276e96e6
jenkins-bot [Mon, 9 May 2016 20:31:52 +0000 (20:31 +0000)]
Merge "Add tests for ApiQueryWatchlist"
Translation updater bot [Mon, 9 May 2016 19:54:07 +0000 (21:54 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: Ia71d910e0558caf3db8e82c06e9c0555c721a440
jenkins-bot [Mon, 9 May 2016 16:04:29 +0000 (16:04 +0000)]
Merge "mediawiki.api: Make the result promise of #postWithToken abortable"
jenkins-bot [Mon, 9 May 2016 15:22:06 +0000 (15:22 +0000)]
Merge "Use better styles for fake button in installer"
Leszek Manicki [Thu, 31 Mar 2016 14:01:53 +0000 (16:01 +0200)]
Add tests for ApiQueryWatchlist
Note: This change does not add tests for deleted revision/log data
(comment, action, user). These should be added in a follow up.
Change-Id: Ia76c39134564c477aa46ccb7b6595173410b0251
jenkins-bot [Sun, 8 May 2016 23:01:08 +0000 (23:01 +0000)]
Merge "Convert Special:Activeusers to use OOUI"
jenkins-bot [Sun, 8 May 2016 22:53:43 +0000 (22:53 +0000)]
Merge "Stop using depreacted base_convert"
Sethakill [Mon, 2 May 2016 07:46:56 +0000 (09:46 +0200)]
Convert Special:Activeusers to use OOUI
Moved FormOptions and form from pager
and recreated it with HtmlForm.
Bug: T117733
Change-Id: Ia330bee63ad17bb75e715cd95e407d5e43310177
jenkins-bot [Sun, 8 May 2016 22:46:15 +0000 (22:46 +0000)]
Merge "Add @since tags to MediaWikiServices"
jenkins-bot [Sun, 8 May 2016 21:42:46 +0000 (21:42 +0000)]
Merge "Search: Change dataLocation default value and add docs"
Translation updater bot [Sun, 8 May 2016 19:53:34 +0000 (21:53 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: If8a5867fbd9578d5f2f61700177fbe240620b54f
jenkins-bot [Sun, 8 May 2016 16:18:51 +0000 (16:18 +0000)]
Merge "Convert Special:MIMESearch to use OOUI."
Sethakill [Fri, 6 May 2016 19:06:57 +0000 (21:06 +0200)]
Convert Special:MIMESearch to use OOUI.
Bug: T117744
Change-Id: I6c8b0f3be92bc455fe62846508d0b21c778b993d
jenkins-bot [Sat, 7 May 2016 23:57:20 +0000 (23:57 +0000)]
Merge "SpecialLockdb and SpecialUnlockdb don't do database writes"
jenkins-bot [Sat, 7 May 2016 19:55:19 +0000 (19:55 +0000)]
Merge "Special:Lockdb return error when database is locked."
umherirrender [Sat, 7 May 2016 17:37:07 +0000 (19:37 +0200)]
Use better styles for fake button in installer
The old style with visibilty:hidden does not let the enter button do the
submit in IE. The new style works in IE. Tested also with FF and Opera.
Change-Id: I7f86217c2905dabc6d222b3d7b896159b204db0a
jenkins-bot [Sat, 7 May 2016 16:38:24 +0000 (16:38 +0000)]
Merge "Convert Special:BookSources to use OOUI"
Sethakill [Sat, 7 May 2016 15:18:08 +0000 (17:18 +0200)]
Special:Lockdb return error when database is locked.
Bug: T134650
Change-Id: Ia8950d0f2ae8a151df1fa1c05e9d33cb7e8e7f10
Sethakill [Tue, 3 May 2016 08:03:27 +0000 (10:03 +0200)]
Convert Special:BookSources to use OOUI
Bug: T117747
Change-Id: Ieae79e8ab3fefb1b2af73961785fc63cafb2c9b6
jenkins-bot [Sat, 7 May 2016 14:28:18 +0000 (14:28 +0000)]
Merge "Convert Special:Lockdb and Special:Unlockdb to OOUI"
Bartosz Dziewoński [Sat, 7 May 2016 14:10:27 +0000 (16:10 +0200)]
SpecialLockdb and SpecialUnlockdb don't do database writes
Change-Id: I95d0df4227632ce2e5fe57e73f3cd1f78e1cc14f
addshore [Sat, 7 May 2016 12:15:44 +0000 (13:15 +0100)]
Make GenderCache use MediaWikiServices
Change-Id: Id20310f78d938bdfa4d29ae483bb1a33bacd2b51
addshore [Sat, 7 May 2016 12:22:17 +0000 (13:22 +0100)]
Add @since tags to MediaWikiServices
Change-Id: I567e1a822bd77d9d4348a0ff94184bb6153b4a2a
addshore [Sat, 7 May 2016 11:59:31 +0000 (12:59 +0100)]
Stop using depreacted base_convert
Change-Id: I72df55ed64b592d039dcf256d49ff3d24b87fa34
Aaron Schulz [Sat, 7 May 2016 04:58:12 +0000 (21:58 -0700)]
Make stashEditFromPreview() call setCacheTime()
This makes sure the output can pass the "presumed fresh" check.
Bug: T134620
Change-Id: I4f9ac2f1b9cef5c6b179946ea02a5e2fad2adc09
Translation updater bot [Sat, 7 May 2016 08:24:33 +0000 (10:24 +0200)]
Localisation updates from https://translatewiki.net.
Change-Id: I229e2b998e58626f03320c521b286fa5dfbaf9c9
jenkins-bot [Sat, 7 May 2016 07:59:01 +0000 (07:59 +0000)]
Merge "Print styles: Wrap CSS-generated URLs"
jenkins-bot [Sat, 7 May 2016 07:55:50 +0000 (07:55 +0000)]
Merge "Print CSS: Avoid page breaks inside <figure>"
Paladox [Fri, 6 May 2016 20:25:56 +0000 (21:25 +0100)]
Update mediawiki/mediawiki-codesniffer to 0.7.1
This also fixes some code style errors.
This also include a performance increase in running phpcs, performance
increase was done by addshore :).
Change-Id: I74a3d3134791ac22c332bb4fa0bc5c3662599394
Aaron Schulz [Sat, 7 May 2016 01:49:44 +0000 (18:49 -0700)]
Make recent changes update jobs use configurable $wgUpdateRowsPerQuery
Change-Id: I05d64ccefda79f46cd792c57f9617a13e5d84973
Aaron Schulz [Fri, 6 May 2016 12:33:54 +0000 (05:33 -0700)]
Bump PRESUME_FRESH_TTL_SEC to improve hit rate and avoid link queries
Task: T134620
Change-Id: I3f76d81ee0ff42bbab6a1b000907e80f4533519c
jenkins-bot [Sat, 7 May 2016 00:11:57 +0000 (00:11 +0000)]
Merge "Remove upgradeRow() call from ?action=purge"
Aaron Schulz [Thu, 5 May 2016 23:40:26 +0000 (16:40 -0700)]
Add TTL_PROC_* constants for clarity
This makes the reason for the cache times more obvious
Change-Id: Ie75df6be77c513feeb6cff3417ccbc124a6a1141
jenkins-bot [Fri, 6 May 2016 19:55:40 +0000 (19:55 +0000)]
Merge "Stop supporting old versions of composer for ComposerPackageModifier"
Ori Livneh [Sat, 23 Apr 2016 08:10:12 +0000 (01:10 -0700)]
Stop supporting old versions of composer for ComposerPackageModifier
The old VersionConstraint class is deprecated in modern versions
of composer which use the version from the composer/semver library.
Bug: T119590
Change-Id: I52ad75e7e25f6583bb4b13489a09d2f2d934e67d
Roan Kattouw [Fri, 6 May 2016 18:25:56 +0000 (11:25 -0700)]
MemcachedClient: Always return an array from get_multi(), don't return false
MemcachedPhpBagOStuff::getMulti() wraps around this method directly,
so get_multi() returning false was causing it to violate
BagOStuff's requirement that getMulti() always return an array.
Change-Id: Ia8f076323aed5b4a12de82d519eb530ed29d7060
jenkins-bot [Fri, 6 May 2016 18:33:13 +0000 (18:33 +0000)]
Merge "registration: Fix mode of files (755 -> 644)"
Florian [Fri, 6 May 2016 12:16:23 +0000 (14:16 +0200)]
registration: Fix mode of files (755 -> 644)
Follows up
7c4d73183cd9a2b38.
Change-Id: I779534561ccb38b4c0f2ca5771dcb0aa810f930a
jenkins-bot [Fri, 6 May 2016 15:10:55 +0000 (15:10 +0000)]
Merge "Add @since tags for TestUser::getUser/Password"
addshore [Fri, 6 May 2016 15:01:40 +0000 (16:01 +0100)]
Add @since tags for TestUser::getUser/Password
Change-Id: I10f4ba36bcb5cb329410d76be3c629635113b2f7
addshore [Mon, 2 May 2016 13:56:53 +0000 (14:56 +0100)]
Add tests for MediawikiTestCase::setService stuff
Change-Id: If689d85f42ae26e786d599f59e76d3ebdfa22212
Martin Urbanec [Thu, 5 May 2016 17:22:38 +0000 (19:22 +0200)]
Changed translation of ChangePassword and PasswordReset
"Resetovat heslo" is translation of PasswordReset, not of ChangePassword.
Change-Id: Iee5a25b0c46e24e6da82fa378bbda170141f8e9e
Florian [Tue, 19 Apr 2016 17:30:39 +0000 (19:30 +0200)]
Search: Change dataLocation default value and add docs
Implemented Krinkle's comments of the followed up commit.
Follow up I2480149
Change-Id: I8e51c0d3a3ca1690ea3ea08469a1cd52d9c151f3
jenkins-bot [Fri, 6 May 2016 12:18:15 +0000 (12:18 +0000)]
Merge "Do not show useless form at Special:ChangeContentModel"
jenkins-bot [Fri, 6 May 2016 09:55:37 +0000 (09:55 +0000)]
Merge "Tweak RefreshLinksJob cache logic"
jenkins-bot [Fri, 6 May 2016 09:55:27 +0000 (09:55 +0000)]
Merge "Do not let DataUpdate exceptions block other deferred updates"
addshore [Fri, 15 Apr 2016 16:29:05 +0000 (17:29 +0100)]
Remove WatchedItemStore::getDefaultInstance
Change-Id: I0c7d706fabee8d1f6fcfbc4c568f375953de8058
addshore [Wed, 6 Apr 2016 10:46:50 +0000 (11:46 +0100)]
Make WatchedItemStore use MediaWikiServices
(This is a re-submi8t of I5c8c1a65 after it got reverted by Iae7f7b7)
Change-Id: I193de7ef1566336040463b71735b09db941d8ce1
jenkins-bot [Fri, 6 May 2016 06:51:32 +0000 (06:51 +0000)]
Merge "Add missing 'public' keywords to some more Language methods"
jenkins-bot [Fri, 6 May 2016 06:35:39 +0000 (06:35 +0000)]
Merge "Fix deleting pages/files when using Microsoft SQL Server"
Ryan Schmidt [Thu, 5 May 2016 05:27:28 +0000 (22:27 -0700)]
Fix deleting pages/files when using Microsoft SQL Server
Right now we have a slew of foreign key violations whenever we try to
delete something due to the way MediaWiki handles page
deletions. Let's remove those foreign keys from places where IDs are
maintained even though the records they are pointing to have been deleted.
Also, work has begun on the massive (re)naming of every constraint in the
schema, so that icky hacks like those employed in these patch files don't
need to be used in the future; rather, we can simply refer to the
constraints by name.
Change-Id: I79938d36a8e35debd3e27052d8ef0e3e6c32f40c
Tim Starling [Fri, 6 May 2016 04:30:40 +0000 (14:30 +1000)]
BlockLevelPass: minor changes due to initial code review
* Improve some comments
* In getCommon() use min() to improve readability
* Use strict equals where possible
* Use camel case in variable names
* Remove the "case 0" optimisation, made sense in PHP 4 but those are
compile-time constants now and are presumably treated as such in both
PHP and HHVM.
* oLine -> inputLine, no idea what "o" stood for
* pos -> colonPos, lt -> ltPos: descriptive
* stack -> level, paragraphStack -> pendingPTag: they're not stacks
* Remove "m" prefix from member variable names
Change-Id: I6c1144c792ba3e1935be88a009a6d6c110d11090
Tim Starling [Fri, 6 May 2016 02:56:37 +0000 (12:56 +1000)]
Split out doBlockLevels() into its own class
It's independent of the rest of the Parser, but quite intrusive, with
its own instance variables and several private functions. It's also
pretty big (500 lines).
I removed a few functions from Parser here which were always marked
@private in the doc comment, but were inappropriately marked
"public" in the function declaration after migration to PHP 5. I grepped
core and deployed extensions and found no callers.
The helper functions are now all private, and the constructor is
private, with just a single public static entry point, reflecting
the self-contained nature of the module and its lack of hooks.
Change-Id: I1693ed48a9194719611b4afd9d989d44f0610f8d
jenkins-bot [Fri, 6 May 2016 00:03:34 +0000 (00:03 +0000)]
Merge "Upgrade mismatched begin() warnings to exceptions"
jenkins-bot [Thu, 5 May 2016 19:47:22 +0000 (19:47 +0000)]
Merge "Introduce mediawiki.router for handling hash fragment navigation"
jdlrobson [Thu, 24 Dec 2015 18:05:00 +0000 (10:05 -0800)]
Introduce mediawiki.router for handling hash fragment navigation
Add a generic barebones Router class to core to allow registration of
routes in a central place and deal with potential clashes in future.
See patches making use of the router:
- Kartographer extension I456a4582a67e31533d51d5817d0f4af57528c35e
- mediawiki.special.preference If7cb76e362464943df20598bd09fd341574756c4
Bug: T114007
Change-Id: I4295db446eac7cf24a3ed89edfa9eefa5cb34b73
jenkins-bot [Thu, 5 May 2016 19:30:53 +0000 (19:30 +0000)]
Merge "Shorten some ridiculously long message names"
jenkins-bot [Thu, 5 May 2016 19:29:00 +0000 (19:29 +0000)]
Merge "mw.ForeignStructuredUpload: Remove #getTemplateName"
Bartosz Dziewoński [Thu, 5 May 2016 03:49:33 +0000 (23:49 -0400)]
Shorten some ridiculously long message names
We don't need to write out that these are from a 'foreign-structured-upload-form',
just 'upload-form' will suffice and isn't ambiguous.
(Updating all the translations too for easy backporting to MW 1.27.)
Changes:
* 'foreign-structured-upload-form-label-own-work'
-> 'upload-form-label-own-work'
* 'foreign-structured-upload-form-label-infoform-categories'
-> 'upload-form-label-infoform-categories'
* 'foreign-structured-upload-form-label-infoform-date'
-> 'upload-form-label-infoform-date'
* 'foreign-structured-upload-form-label-own-work-message-local'
-> 'upload-form-label-own-work-message-local'
* 'foreign-structured-upload-form-label-not-own-work-message-local'
-> 'upload-form-label-not-own-work-message-local'
* 'foreign-structured-upload-form-label-not-own-work-local-local'
-> 'upload-form-label-not-own-work-local-local'
* 'foreign-structured-upload-form-label-own-work-message-default'
-> 'upload-form-label-own-work-message-default'
* 'foreign-structured-upload-form-label-not-own-work-message-default'
-> 'upload-form-label-not-own-work-message-default'
* 'foreign-structured-upload-form-label-not-own-work-local-default'
-> 'upload-form-label-not-own-work-local-default'
* 'foreign-structured-upload-form-label-own-work-message-shared'
-> 'upload-form-label-own-work-message-shared'
* 'foreign-structured-upload-form-label-not-own-work-message-shared'
-> 'upload-form-label-not-own-work-message-shared'
* 'foreign-structured-upload-form-label-not-own-work-local-shared'
-> 'upload-form-label-not-own-work-local-shared'
Change-Id: Ia8c51cf1143c659e707efd846c4ece00b0d08f96
Brad Jorsch [Thu, 5 May 2016 17:12:58 +0000 (13:12 -0400)]
Run maintenance/generateLocalAutoload.php
Ie06782ffb manually updated autoload.php, again.
Change-Id: I485b85cf52f3a39083919d5d8f658f597d1ff0c8
jenkins-bot [Thu, 5 May 2016 16:09:56 +0000 (16:09 +0000)]
Merge "Warn on session access in profileinfo.php and opensearch_desc.php"
Brad Jorsch [Thu, 5 May 2016 15:35:10 +0000 (11:35 -0400)]
Warn on session access in profileinfo.php and opensearch_desc.php
These are so simple there will probably be no problems, but let's set
them to 'warn' for a week just to be sure.
Bug: T127233
Change-Id: I04007faaf541f30dcaf2085fa86b45bea1ecb754
Brad Jorsch [Thu, 5 May 2016 15:23:04 +0000 (11:23 -0400)]
Release note for Id83eda95
Change-Id: I85f1856c3b5a5670931a5d718c6e747cf44ce798
jenkins-bot [Thu, 5 May 2016 13:06:57 +0000 (13:06 +0000)]
Merge "Don't stash on preview if $wgAjaxEditStash=false"
jenkins-bot [Thu, 5 May 2016 13:00:46 +0000 (13:00 +0000)]
Merge "Rephrase tog-norollbackdiff"